67807a
@@ -301,10 +301,7 @@
class FileSystemDeploymentService implements DeploymentScanner {
 
     private void establishDeployedContentList(File dir, final DeploymentOperations deploymentOperations) {
         final Set<String> deploymentNames = deploymentOperations.getDeploymentsStatus().keySet();
-        final File[] children = dir.listFiles();
-        if (children == null || children.length == 0) {
-            return;
-        }
+        final File[] children = listDirectoryChildren(dir);
         for (File child : children) {
             final String fileName = child.getName();
             if (child.isDirectory()) {
@@ -617,11 +614,7 @@
class FileSystemDeploymentService implements DeploymentScanner {
      * @param scanContext context of the scan
      */
     private void scanDirectory(final File directory, final String relativePath, final ScanContext scanContext) {
-        final File[] children = directory.listFiles(filter);
-        if (children == null) {
-            return;
-        }
-
+        final File[] children = listDirectoryChildren(directory, filter);
         for (File child : children) {
             final String fileName = child.getName();
             if (fileName.endsWith(DEPLOYED)) {
@@ -1112,7 +1105,11 @@
class FileSystemDeploymentService implements DeploymentScanner {
     }
 
     private static File[] listDirectoryChildren(File directory) {
-        File[] result = directory.listFiles();
+        return listDirectoryChildren(directory, null);
+    }
+
+    private static File[] listDirectoryChildren(File directory, FileFilter filter) {
+        File[] result = directory.listFiles(filter);
         if (result == null) {
             throw DeploymentScannerLogger.ROOT_LOGGER.cannotListDirectoryFiles(directory);
         }
